From 181c53885c6f03bb6d1b3ed37f5060da93043141 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 11 May 2006 17:15:40 +0000 Subject: [PATCH] Regenerated from Xorg 7.1 keysyms.h, using gdkkeysyms-update.pl. 2006-05-11 Matthias Clasen * gdk/gdkkeysyms.h: Regenerated from Xorg 7.1 keysyms.h, using gdkkeysyms-update.pl. * gdk/gdkkeysyms-update.pl: Script to sync gdkkeysyms.h with Xorg. (#321896, Simos Xenitellis) * gdk/Makefile.am (EXTRA_DIST): Add gdkkeysyms-update.pl --- ChangeLog | 8 + ChangeLog.pre-2-10 | 8 + gdk/Makefile.am | 1 + gdk/gdkkeysyms-update.pl | 119 ++++++++++++ gdk/gdkkeysyms.h | 401 +++++++++++++++++++++++++++++++++++++-- 5 files changed, 524 insertions(+), 13 deletions(-) create mode 100755 gdk/gdkkeysyms-update.pl diff --git a/ChangeLog b/ChangeLog index 39a915cce5..5c7e96bf74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2006-05-11 Matthias Clasen + * gdk/gdkkeysyms.h: Regenerated from Xorg 7.1 keysyms.h, using + gdkkeysyms-update.pl. + + * gdk/gdkkeysyms-update.pl: Script to sync gdkkeysyms.h + with Xorg. (#321896, Simos Xenitellis) + + * gdk/Makefile.am (EXTRA_DIST): Add gdkkeysyms-update.pl + * gdk/gdkkeysyms.h: Consistently use lowercase in hex numbers. 2006-05-10 Carlos Garnacho diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 39a915cce5..5c7e96bf74 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,13 @@ 2006-05-11 Matthias Clasen + * gdk/gdkkeysyms.h: Regenerated from Xorg 7.1 keysyms.h, using + gdkkeysyms-update.pl. + + * gdk/gdkkeysyms-update.pl: Script to sync gdkkeysyms.h + with Xorg. (#321896, Simos Xenitellis) + + * gdk/Makefile.am (EXTRA_DIST): Add gdkkeysyms-update.pl + * gdk/gdkkeysyms.h: Consistently use lowercase in hex numbers. 2006-05-10 Carlos Garnacho diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 9371061897..6908313bdb 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -8,6 +8,7 @@ EXTRA_DIST = \ keyname-table.h \ gen-keyname-table.pl \ gdkconfig.h.win32 \ + gdkkeysyms-update.pl \ gdk.def \ gdkmarshalers.list \ makeenums.pl \ diff --git a/gdk/gdkkeysyms-update.pl b/gdk/gdkkeysyms-update.pl new file mode 100755 index 0000000000..564d32ee3d --- /dev/null +++ b/gdk/gdkkeysyms-update.pl @@ -0,0 +1,119 @@ +#!/usr/bin/env perl + +# Updates http://cvs.gnome.org/viewcvs/gtk%2B/gdk/gdkkeysyms.h from upstream (X.org 6.9/7.0), +# OLD OLD -----from http://cvs.freedesktop.org/xorg/xc/include/keysymdef.h------ OLD OLD +# from http://webcvs.freedesktop.org/*checkout*/xorg/proto/X11/keysymdef.h +# +# Author : Simos Xenitellis . +# Version : 1.0 +# +# Input : http://webcvs.freedesktop.org/xorg/proto/X11/keysymdef.h +# Output : http://cvs.gnome.org/viewcvs/gtk%2B/gdk/gdkkeysyms.h +# +# Notes : It downloads keysymdef.h from the Internet if not found locally +# Notes : and creates an updated gdkkeysyms.h + +use strict; + +# Used for reading the keysymdef symbols. +my @keysymelements; + +if ( ! -f "keysymdef.h" ) +{ + print "Trying to download keysymdef.h from\n"; + print "http://webcvs.freedesktop.org/xorg/proto/X11/keysymdef.h: "; + die "Unable to download keysymdef.h from http://webcvs.freedesktop.org/xorg/proto/X11/keysymdef.h\n" + unless system("wget -q \"http://webcvs.freedesktop.org/*checkout*/xorg/proto/X11/keysymdef.h\"") == 0; + print " done.\n\n"; +} +else +{ + print "We are using existing keysymdef.h found in this directory.\n"; + print "It is assume that you took care and it is a recent version\n"; + print "as found at http://webcvs.freedesktop.org/*checkout*/xorg/proto/X11/keysymdef.h\n\n"; +} + + +if ( -f "gdkkeysyms.h" ) +{ + print "There is already a gdkkeysyms.h file in this directory. We are not overwriting it.\n"; + print "Please move it in order to run this script.\n"; + die "Exiting...\n\n"; +} + +# Source: http://cvs.freedesktop.org/xorg/xc/include/keysymdef.h +die "Could not open file keysymdef.h: $!\n" unless open(IN_KEYSYMDEF, "<:utf8", "keysymdef.h"); + +# Output: gtk+/gdk/gdkkeysyms.h +die "Could not open file gdkkeysyms.h: $!\n" unless open(OUT_GDKKEYSYMS, ">:utf8", "gdkkeysyms.h"); + +print OUT_GDKKEYSYMS<) +{ + next if ( ! /^#define / ); + + @keysymelements = split(/\s+/); + die "Internal error, no \@keysymelements: $_\n" unless @keysymelements; + + $_ = $keysymelements[1]; + die "Internal error, was expecting \"XC_*\", found: $_\n" if ( ! /^XK_/ ); + + $_ = $keysymelements[2]; + die "Internal error, was expecting \"0x*\", found: $_\n" if ( ! /^0x/ ); + + $keysymelements[1] =~ s/^XK_/GDK_/g; + + printf OUT_GDKKEYSYMS "#define %s 0x%03x\n", $keysymelements[1], hex($keysymelements[2]); +} + +#$gdksyms{"0"} = "0000"; + +close IN_KEYSYMDEF; + + +print OUT_GDKKEYSYMS<